merge
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 3 Jan 2006 13:36:56 +0000 (14:36 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 3 Jan 2006 13:36:56 +0000 (14:36 +0100)

Trivial merge